From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 11 Feb 2011 01:32:13 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~2383^2~15
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=78998ca9cf65cc65579c8b756d35a2db9d3c8ef7;p=emacs.git

Merge from mainline.
---

78998ca9cf65cc65579c8b756d35a2db9d3c8ef7